Skip to content

Remove unused patches/ files as already in vendor-patches directory and use NewOptimizedDirectorySourceLocator - #4844

Merged
samsonasik merged 13 commits into
mainfrom
remove-unused-patches
Aug 24, 2023
Merged

Remove unused patches/ files as already in vendor-patches directory and use NewOptimizedDirectorySourceLocator#4844
samsonasik merged 13 commits into
mainfrom
remove-unused-patches

Conversation

@samsonasik

@samsonasik samsonasik commented Aug 24, 2023

Copy link
Copy Markdown
Member

No description provided.

@samsonasik

samsonasik commented Aug 24, 2023

Copy link
Copy Markdown
Member Author

New PHPStan notice seems due to new PHPStan release:

https://github.com/phpstan/phpstan/releases/tag/1.10.31


Run vendor/bin/phpstan analyse --ansi --error-format symplify
Note: Using configuration file /home/runner/work/rector-src/rector-src/phpstan.neon.
    0/2091 [░░░░░░░░░░░░░░░░░░░░░░░░░░░░]   0%
  420/2091 [▓▓▓▓▓░░░░░░░░░░░░░░░░░░░░░░░]  20%
 1060/2091 [▓▓▓▓▓▓▓▓▓▓▓▓▓▓░░░░░░░░░░░░░░]  50%
 2091/2091 [▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓] 100%

 ------------------------------------------------------------------------
  packages/NodeTypeResolver/Reflection/BetterReflection/SourceLocatorProvider/DynamicSourceLocatorProvider.php:68
 ------------------------------------------------------------------------
  - '#Instantiation of deprecated class PHPStan\\Reflection\\BetterReflection\\SourceLocator\\OptimizedDirectorySourceLocator\:
Use NewOptimizedDirectorySourceLocator#'
 ------------------------------------------------------------------------

@samsonasik

samsonasik commented Aug 24, 2023

Copy link
Copy Markdown
Member Author

Creation service may from OptimizedDirectorySourceLocatorFactory, I will check.

@samsonasik

samsonasik commented Aug 24, 2023

Copy link
Copy Markdown
Member Author

@TomasVotruba let's try using OptimizedDirectorySourceLocatorFactory 91bcb7c

@samsonasik

samsonasik commented Aug 24, 2023

Copy link
Copy Markdown
Member Author

Bump PHPStan to 1.10.31 to ensure OptimizedDirectorySourceLocatorFactory exists 👍 f68bd9c

@samsonasik samsonasik changed the title Remove unused patches/ files as already in vendor-patches directory Remove unused patches/ files as already in vendor-patches directory and use NewOptimizedDirectorySourceLocator Aug 24, 2023
@samsonasik

samsonasik commented Aug 24, 2023

Copy link
Copy Markdown
Member Author

filesByDirectory seems not needed, use directories instead and let OptimizedDirectorySourceLocatorFactory locate it.

@samsonasik

samsonasik commented Aug 24, 2023

Copy link
Copy Markdown
Member Author

@TomasVotruba I removed PhpFilesFinder which seems the filter .blade.php only on directory, while not on file, which seems inconsistent cdd9fa0

@samsonasik

samsonasik commented Aug 24, 2023

Copy link
Copy Markdown
Member Author

It seems cause error:

➜  rector-src git:(remove-unused-patches) vendor/bin/phpunit packages-tests/Skipper/Skipper/SkipperRectorRuleTest.php
PHPUnit 10.3.2 by Sebastian Bergmann and contributors.

Runtime:       PHP 8.2.5
Configuration: /Users/samsonasik/www/rector-src/phpunit.xml

F                                                                   1 / 1 (100%)

Time: 00:00.023, Memory: 20.00 MB

There was 1 failure:

1) Rector\Tests\Skipper\Skipper\SkipperRectorRuleTest::testRemovingServiceFromContainer
Failed asserting that actual size 2 matches expected size 1.

samsonasik
samsonasik commented Aug 24, 2023
View reviewed changes
Comment thread packages-tests/Skipper/Skipper/SkipperRectorRuleTest.php Outdated
@samsonasik

samsonasik commented Aug 24, 2023

Copy link
Copy Markdown
Member Author

Should be fixed now 👍

@samsonasik

samsonasik commented Aug 24, 2023

Copy link
Copy Markdown
Member Author

All checks have passed 🎉 @TomasVotruba let's give it a try 👍

@samsonasik
samsonasik enabled auto-merge (squash) August 24, 2023 15:20
@samsonasik
samsonasik merged commit a480c51 into main Aug 24, 2023
@samsonasik
samsonasik deleted the remove-unused-patches branch August 24, 2023 15:20
@samsonasik

samsonasik commented Aug 24, 2023

Copy link
Copy Markdown
Member Author

@TomasVotruba it seems cause error in downgrade build:

https://github.com/rectorphp/rector-src/actions/runs/5965685296/job/16183665877#step:10:19

I will revert NewOptimizedDirectorySourceLocator to only remove patches dir.

samsonasik added a commit that referenced this pull request Aug 24, 2023
@samsonasik
Revert "Remove unused patches/ files as already in vendor-patches dir…
7dc3641 
…ectory and use NewOptimizedDirectorySourceLocator (#4844)"

This reverts commit a480c51.
@samsonasik samsonasik mentioned this pull request Aug 24, 2023
Merged
@samsonasik

samsonasik commented Aug 24, 2023

Copy link
Copy Markdown
Member Author

I created PR:

to revert use NewOptimizedDirectorySourceLocator

samsonasik added a commit that referenced this pull request Aug 24, 2023
@samsonasik
Revert "use NewOptimizedDirectorySourceLocator" (#4845)
07e36e3 
* Revert "Remove unused patches/ files as already in vendor-patches directory and use NewOptimizedDirectorySourceLocator (#4844)"

This reverts commit a480c51.

* remove patch dir

* phpstan notice
@TomasVotruba

TomasVotruba commented Aug 24, 2023

Copy link
Copy Markdown
Member

These should be 2 separated PRs, ideally with PHPStan lock in patch removing instead of fixing and removing at once.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@TomasVotruba TomasVotruba TomasVotruba approved these changes

Assignees

No one assigned

Labels

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@samsonasik @TomasVotruba @actions-user